st-entry: don't possibly allocate actors a negative size

Clutter will complain about this, so protect the code against such edge
case.

https://bugzilla.gnome.org/show_bug.cgi?id=783484

diff --git a/src/st/st-entry.c b/src/st/st-entry.c
index 82cf5c22e4209448de9763a6c8bff537f4c5d0e2..c92991e3fe5d574097e5f040e2b16c8394a4f9f1 100644 (file)
--- a/src/st/st-entry.c
+++ b/src/st/st-entry.c
@@ -475,7 +475,7 @@ st_entry_allocate (ClutterActor          *actor,
       clutter_actor_allocate (left_icon, &icon_box, flags);
 
       /* reduce the size for the entry */
-      child_box.x1 += icon_w + priv->spacing;
+      child_box.x1 = MIN (child_box.x2, child_box.x1 + icon_w + priv->spacing);
     }
 
   if (right_icon)
@@ -492,7 +492,7 @@ st_entry_allocate (ClutterActor          *actor,
       clutter_actor_allocate (right_icon, &icon_box, flags);
 
       /* reduce the size for the entry */
-      child_box.x2 -= icon_w + priv->spacing;
+      child_box.x2 = MAX (child_box.x1, child_box.x2 - icon_w - priv->spacing);
     }
 
   clutter_actor_get_preferred_height (priv->entry, child_box.x2 - child_box.x1,